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

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

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



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