Merge "HeadsetService: extend check to allow dual app" into tm-qpr-dev am: 21e1b8d7

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



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