Merge changes from topic "am-aac1c24a-fd30-46b7-bd91-ac0ed2dd85d8" into q-keystone-qcom-dev

* changes:
  [automerger skipped] Store volume for device which not supporting AVRCP skipped: 64cda32f0c
  Store volume for device which not supporting AVRCP