[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L92000000957720434:N15800001319641700" into tm-qpr-dev am: fab5dcfe -s ours

am skip reason: Merged-In I4fc321b77a2909edfdf71b26f5fd5793aa45464c with SHA-1 11f52456 is already in history

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



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