[automerger skipped] Merge "Gracefully handled IP changes" am: 07a75898 am:...

[automerger skipped] Merge "Gracefully handled IP changes" am: 07a75898 am: de0d850e -s ours am: c6bad986 -s ours am: d2ff8a5e -s ours

am skip reason: Merged-In I27d96617358292edb2bd93f465a05ade811cc6cf with SHA-1 b4d74ce1 is already in history

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



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