Merge "Non-Split: Update MM regarding codec related changes in below cases only." into p-keystone-qcom