[automerger skipped] Merge changes from topic "cherrypicker-L75500000959321800:N94900001350725827" into udc-dev am: 5e9e081b -s ours am: 99c5b7b1 -s ours

am skip reason: Merged-In If2ba19070d44b808e20ed1950cef27ff300f9ccf with SHA-1 f7bf7a80 is already in history

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



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