[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-c5004b4dadf042148cec67dd95d5316c" into udc-dev-plus-aosp am: d633830b -s ours

am skip reason: Merged-In I6172d11a9c745018ca40e2df8b0e70f4f9728fde with SHA-1 d85588ff is already in history

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



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