[conflict] Merge remote-tracking branch 'goog/tm-qpr-dev' into merge-qpr-dev 2p: 7361d3f186

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

Tag: #feature
Bug: 244485221
Test: Treehugger
Ignore-AOSP-First: Merge conflict resolution
Change-Id: Id8f412e933976038ba0dfc76a54d787e84cc9ac3