Merge changes from topic "am-8808428b-46d9-4bf8-b4a6-630860aa5cfa" into q-keystone-qcom-dev

* changes:
  [automerger] HFP: AG: Add null check for AdapterService am: 05f3851efe
  HFP: AG: Add null check for AdapterService