Merge "Check for FEATURE_TELEPHONY before clearing APNs"

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

@@ -8513,6 +8513,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
     }
 
     private void clearOverrideApnUnchecked() {
+        if (!mHasTelephonyFeature) {
+            return;
+        }
         // Disable Override APNs and remove them from database.
         setOverrideApnsEnabledUnchecked(false);
         final List<ApnSetting> apns = getOverrideApnsUnchecked();