Merge "HFP:AG: Add support for CGMI, CGMM" into q-keystone-qcom-dev