Merge "QMF configuration flag QMF_FLAG_MPSLDFB has always priority over QMF_FLAG_CLDFB"
am: cf4098ed3b

Change-Id: I0166285d3129440c9caa444fe4fcfa9d59c1f6c1