[automerger skipped] Merge "AudioService: fix Bluetooth codec sampling rate...

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

am skip reason: Merged-In Id66e9f8eca81f299ffd8906e6c55dbd8dbc70948 with SHA-1 f7a2a124 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26833069



Change-Id: Id90c3825d10b7053541a0383e820cf84299ea2d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>