Merge changes from topic "bluetooth_prebuilt_phase4" into udc-dev am: 29154ebd am: 675646ab

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



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