[automerger skipped] Merge "Fixed a crash when data network does not have PCO"...

[automerger skipped] Merge "Fixed a crash when data network does not have PCO" into tm-qpr-dev am: 70ebab5f am: ce7792e6 -s ours

am skip reason: Merged-In I832ddcc80f4e92d487bd0fa93ec63f74e4978de3 with SHA-1 a7db06d5 is already in history

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



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