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

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



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