Merge changes from topic "am-74066b0a2df8413da4a28f943f69c551" into main

* changes:
  [automerger skipped] Merge "AudioService: fix Bluetooth codec sampling rate change" into 24D1-dev am: 30da9b259b -s ours
  [automerger skipped] AudioService: fix Bluetooth codec sampling rate change am: bf7f8f93d3 -s ours