Merge "HFP: add null check mAdapterService object" into q-keystone-qcom-dev