Merge changes from topic "cherrypicker-L09000000956548908:N73400001298271020"...

Merge changes from topic "cherrypicker-L09000000956548908:N73400001298271020" into tm-qpr-dev am: 9fe430d0

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



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