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

Merge "Gracefully handled IP changes" into tm-dev am: 66359a07 am: ceefe61f am: 519ba419 am: 99792f1e

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



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