[automerger skipped] Merge changes...

[automerger skipped] Merge changes I1b09f805,I82861bd9,Id51c1821,Ib3a3f68a,I84391473 into tm-qpr-dev am: 616d44b4 am: 1e7dfca9 -s ours

am skip reason: Merged-In I1b09f805c06eb918d03b4bf67a3d26fcb0513569 with SHA-1 7a3e85c7 is already in history

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



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