[automerger skipped] Merge changes from topic "cherrypicker-L46000000959685092:N13700001355375856" into udc-dev am: f8c7608b -s ours am: 4a77adc8 -s ours

am skip reason: Merged-In I9e3dc981e44b261f270359260955d9f9094ba895 with SHA-1 02c5c56b is already in history

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



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