Merge changes from topic "QP1A.190501.001" into q-keystone-qcom-dev

* changes:
  Revert: "Refactor A2dpSink and AvrcpController"
  Merge QP1A.190501.001