Merge changes from topic "am-6a2894357de542969b5b4538be05875a" into udc-dev am: 3d3c2ec4 -s ours

am skip reason: Merged-In I629f44f477ffe111112db70738fb4241e179684d with SHA-1 a66bb86d is already in history. Merged-In was found from reverted change.

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

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



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