[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L12400000957513984:N30500001315227278" into tm-qpr-dev am: 818a3830 -s ours am: b101f705 -s ours

am skip reason: Merged-In Iecbdeb1d591604d3f5403f06f9b1120973404acd with SHA-1 183b117a is already in history

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



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