Merge changes from topic "am-e9df03c813a84fd89c2104a0334cc2af" into tm-d1-dev-plus-aosp

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