[automerger skipped] Merge changes from topic "cherrypicker-L61800000959347098:N04400001351011042" into udc-dev am: 35674bc3 -s ours am: fcb785ad -s ours

am skip reason: Merged-In Ie7179cbe3d3cb157bf1456b3db13a4f9acdf8e63 with SHA-1 0a62f138 is already in history

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



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