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

[automerger skipped] HeadsetService: extend check to allow dual app am: c5f3ad2d -s ours am: 5d1b492d -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: Ie5091abb8461cd888aca5244417b594c8c83f99a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>