[automerger skipped] Merge "Fix phone process crash due to NPE in DataNetwork"...

[automerger skipped] Merge "Fix phone process crash due to NPE in DataNetwork" into udc-dev am: 1f2de34d am: d376007e -s ours

am skip reason: Merged-In Ida123e2b493cb70b005b2ac47843d7c6d6f14656 with SHA-1 a731f412 is already in history

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



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