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

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

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



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