[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L91600000957583311:N61400001316745756" into tm-qpr-dev am: b6c8f9e5 am: 56782f44 -s ours

am skip reason: Merged-In I1ac5b56fe85cc06201c1346f4266ad0ff9d4e7bc with SHA-1 7fc66d2c is already in history

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



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