Merge "fix infinite loop in enableModem TC" am: 18704f22a0 am: f886160100

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

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