[automerger skipped] Fixed IMS network disconnected when data disabled am:...

[automerger skipped] Fixed IMS network disconnected when data disabled am: 1d2d57d0 am: bddd2e12 am: 87b56f99 -s ours am: b4fad4a5 -s ours

am skip reason: Merged-In Ie58c08653b390589764d2ab03c196b400c5345db with SHA-1 adb37f22 is already in history

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

Change-Id: Iffaab8f5a5e0f1cb0b153994462fae77215dc46e