[automerger skipped] Merge "Lazy activation of A2DP or HFP" into tm-qpr-dev...

[automerger skipped] Merge "Lazy activation of A2DP or HFP" into tm-qpr-dev am: 564cd4a3 -s ours am: 6ccae73d -s ours

am skip reason: Merged-In Iee2442b3cc6aeecce4a0ec1e87f1b477c894199b with SHA-1 f1fb822c is already in history

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



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