Merge changes from topic "update_Bluetooth_prebuilt" into tm-qpr-dev am: 4234e822

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



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