[automerger skipped] Merge changes I306e8c61,I271da857 into tm-qpr-dev am: c92032e4 -s ours

am skip reason: Merged-In I306e8c61969d9228186bd5d3e0e341a4c584e916 with SHA-1 b8b7dae8 is already in history

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



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