[automerger skipped] Merge "HeadsetService: extend check to allow dual app"...

[automerger skipped] Merge "HeadsetService: extend check to allow dual app" into tm-qpr-dev am: 21e1b8d7 -s ours am: ee1e48cc -s ours

am skip reason: Merged-In Id72d8e6d3155709a3fa76630b2cc33f6a49e08ad with SHA-1 851d7e0d is already in history

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



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