[automerger skipped] Merge "Fix No Service when connected to WiFi on APM" am:...

[automerger skipped] Merge "Fix No Service when connected to WiFi on APM" am: 440f8084 am: b8a85972 am: f290700a am: c043899b -s ours am: fb76a082 -s ours

am skip reason: Change-Id Ia36df8edd75fa0a48036cda073b96087ba9981a4 with SHA-1 f12875aa is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1438915

Change-Id: I3e66659563139fa09b561c80c2836806f6a1d95e