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

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



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