Merge "fix infinite loop in enableModem TC" into tm-dev am: 04e76ebf am: b0b15ece

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



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