Merge "Make BT audio routing more resemble the Android S behavior" am:...

Merge "Make BT audio routing more resemble the Android S behavior" am: 18943264 am: de6e935d am: 8002e45b

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



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