[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L33600000959207446:N61900001348751261" into tm-mainline-prod am: 9be10b8a -s ours

am skip reason: Merged-In I87c1f88dba782bb25e437a388617fcfcf2fd9c6d with SHA-1 a456d6a5 is already in history

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



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