[automerger skipped] Merge changes...

[automerger skipped] Merge changes I7cea765c,Idb4bea1b,I7bf47376,I0cf56537,I4ffb6027 into udc-dev am: ca4985b4 -s ours

am skip reason: Merged-In Ic7d11cf33562ccfca8321cdcfa0e4163614c4e0a with SHA-1 e255fcf5 is already in history

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



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