[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L92400000960618248:N32200001368009453" into udc-dev am: 9e9c0ae4 -s ours

am skip reason: Merged-In I20eb76aad6ecdcdf4cc47289735d72d5c1e2da1f with SHA-1 609db0f4 is already in history

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



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