Merge changes from topic "am-addcab3ee9974cb694563f9bd2d7266f" into tm-qpr-dev-plus-aosp am: 2591ecfb -s ours

am skip reason: Merged-In I0253b9d66b12bbee3c9994298ba054b47cd035dd with SHA-1 7a4e504e is already in history

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



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