[automerger skipped] Merge changes from topic "cherrypicker-L89000000959335844:N98300001351013836" into udc-dev am: d32506e6 -s ours am: 4840fbd6 -s ours

am skip reason: Merged-In Ia0aa8bdf03cb66b3d2957dee24a27669651eb123 with SHA-1 8cd10b78 is already in history

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



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