Merge "Handle null ApnSetting in PDCS" am: 600bc1f2ef am: 9b79ebed9b

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

Change-Id: I3a566cd3a6b96fe0555e393cfc381d0cd7d5a6fe