Merge changes from topic "am-d2bb75c1-0f62-4832-a373-25e2cfdea1e1" into q-keystone-qcom-dev

* changes:
  [automerger] Don't throw exceptions if HFP, A2DP services are started again am: b0fd464e62
  Don't throw exceptions if HFP, A2DP services are started again