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

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



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