[automerger skipped] Merge "Make BT audio routing more resemble the Android S...

[automerger skipped] Merge "Make BT audio routing more resemble the Android S behavior" into tm-qpr-dev am: 553e5bb9 am: c3f37953 -s ours

am skip reason: Merged-In Ia87e342e742f3956cca24de0a305a618e8c0e289 with SHA-1 18d22e0e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/20605672



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