[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L28300000957131399:N26000001307705233" into tm-qpr-dev am: 68a35bf3 -s ours

am skip reason: Merged-In I633d6fd7c9ccbb8c8a1224f9819f28db94ec3302 with SHA-1 7f445bbd is already in history

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



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