[automerger skipped] Merge "fix infinite loop in enableModem TC" am:...

[automerger skipped] Merge "fix infinite loop in enableModem TC" am: 18704f22 am: f8861601 am: bd7fd894 -s ours am: 8cb2c3f2 -s ours am: 4a6d30bf -s ours am: 370719bd -s ours

am skip reason: Merged-In I879faa5ecef026865d17ad1a23e52cb9f8f70454 with SHA-1 62cf4546 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2060627



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