[automerger skipped] Merge changes from topic "cherrypicker-L96100000959682912:N36600001355644358" into udc-dev am: 6df937fa -s ours am: 85d48756 -s ours

am skip reason: Merged-In Ifcb5b21c7a6e796ed43985132ad8bc4b116f4c48 with SHA-1 075d0d3d is already in history

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



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