[automerger skipped] Merge changes I270939ab,Ie6958d9b into tm-qpr-dev am: e06ec351 am: b9cd92c4 -s ours

am skip reason: Merged-In I270939abda710e241c3c2ef56164c8e0f9acbc15 with SHA-1 15d953fe is already in history

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



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