[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L76600000960405157:N45800001364684986" into tm-mainline-prod am: abe848d3 am: c65515b1 -s ours

am skip reason: Merged-In I84a780d703079940642664e462deadd8ed335ec6 with SHA-1 88f25089 is already in history

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



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