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

services/core/java/com/android/server/TelephonyRegistry.java

@@ -2009,10 +2009,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
             return;
         }
 
-        ApnSetting apnSetting = preciseState.getApnSetting();
-
         synchronized (mRecords) {
-            if (validatePhoneId(phoneId)) {
+            if (validatePhoneId(phoneId) && preciseState.getApnSetting() != null) {
                 Pair<Integer, ApnSetting> key = Pair.create(preciseState.getTransportType(),
                         preciseState.getApnSetting());
                 PreciseDataConnectionState oldState = mPreciseDataConnectionStates.get(phoneId)