[automerger skipped] Merge "Telecomm changes to support dual mode Bluetooth...

[automerger skipped] Merge "Telecomm changes to support dual mode Bluetooth audio devices" into udc-qpr-dev am: ba4bf50a -s ours

am skip reason: Merged-In I4d2212178ffced79b812f4e808b8331ae0fe689e with SHA-1 03387266 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/23517903



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