Merge changes from topic "bluetooth_prebuilt_340715070" into udc-dev am: 1b2e7310 am: 5b238855

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



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