Merge changes from topic "am-cbd64a1e1d36468691ede3692d8459b9" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "fix-cts-2" into tm-dev am: d0bd88ef am: 75d45ae2 am: 0a5347fe -s ours
  [automerger skipped] BASS: Fix BASS client service to pass CTS tests am: 771724d4 am: 1d641070 am: 8e44a0cb -s ours
  [automerger skipped] Copy to std::string when parsing LE audio config am: 37681976 am: b753dc57 am: 8ea88071 -s ours