Merge changes from topic "cherrypicker-L45200000958350315:N48800001332110545"...

Merge changes from topic "cherrypicker-L45200000958350315:N48800001332110545" into tm-qpr-dev am: f1b2021f

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



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