[automerger skipped] Merge "HeadsetPhoneState: Synchronize startListenForPhoneState to prevent race condition" into tm-dev am: e9676622 am: 8bd410ff am: a0b87dfa -s ours

am skip reason: Merged-In I168b16a63d5b912a934df5fd40d65169473168bc with SHA-1 84eafd76 is already in history

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



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