[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L67000000958213112:N89700001329421629" into tm-qpr-dev am: d80186c1 -s ours

am skip reason: Merged-In I9aa66e0f765c185405e002ae21d35ad784c9f9d8 with SHA-1 ba7d9d51 is already in history

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



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