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

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



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