[automerger skipped] Merge changes from topic "cherrypicker-L35800000960417963:N80900001364843091" into udc-dev-plus-aosp am: 51e8064b -s ours

am skip reason: Merged-In I78a1ee50dea0113381e51f8521711d758dc759cf with SHA-1 d5ec5273 is already in history

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



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