[automerger skipped] Merge "DO NOT MERGE Fix headset detection logic in AnalogHeadsetAudioActivity." into sc-v2-dev am: 15d1768287 am: 72f46119fd -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/16522506

Change-Id: I90799502261cdfdb0b575b96b902b122cf13c4e5