Merge changes from topic "cherrypicker-L67000000958213112:N89700001329421629"...

Merge changes from topic "cherrypicker-L67000000958213112:N89700001329421629" into tm-qpr-dev am: d80186c1

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



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