[automerger skipped] Merge "Handle null ApnSetting in PDCS" am: 600bc1f2 am: 9b79ebed am: 871629bd -s ours am: 59c50443 -s ours am: 4d44b92c -s ours

am skip reason: Merged-In I7a59d1d4bc6838b5032920e3a89b984336481562 with SHA-1 87af38b1 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2032086

Change-Id: I116ba18647f071e3f9922e49cd477e6e52b2add9