Merge changes from topic "am-4acfd7a7-8bfe-423e-93e9-3bba77d43a0c" into q-keystone-qcom-dev

* changes:
  [automerger] Remove device from  A2DP or  HF retry set am: b4fa553369
  Remove device from  A2DP or  HF retry set