[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L25700000958445487:N65500001334131684" into tm-qpr-dev am: 3ff06d8e -s ours

am skip reason: Merged-In Ic27f572e73527bdf1af47e3781372043f8e310be with SHA-1 4f221c97 is already in history

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



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