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

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



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