Merge "Gracefully handled IP changes" into tm-dev am: 66359a07 am: ceefe61f am: 519ba419

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



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