[automerged blank] Merge remote-tracking branch 'origin/tm-qpr-dev' into...

[automerged blank] Merge remote-tracking branch 'origin/tm-qpr-dev' into tm-mainline-prod 2p: 65843c98

Blank merge reason: Change-Id Id8f412e933976038ba0dfc76a54d787e84cc9ac3 with SHA-1 5d543a3d is in history

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

Bug: 244485221
Change-Id: Ia7228ae1450d612d78a5465cb8db0893e96c14e2
Merged-In: Id8f412e933976038ba0dfc76a54d787e84cc9ac3