[automerger skipped] Merge "Handle null ApnSetting in PDCS" am: 600bc1f2ef am: 9b79ebed9b am: 871629bd60 -s ours am: 59c5044378 -s ours
am skip reason: Merged-In I7a59d1d4bc6838b5032920e3a89b984336481562 with SHA-1 87af38b1c3 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2032086
Change-Id: If302b3318107faf06c455012e33ab85c3ddc4e0d
This commit is contained in: