Merge changes from topic "bluetooth_pb1" into udc-dev am: 0b13de7e

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



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