Merge "Hide emergency APN in user settings" am: 6c553c0c5c am: 90a326dc3c am: d36b37ab1c

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1900491

Change-Id: I41943ab50d50986dd56c3eb89f474751b6cc14cf

src/com/android/settings/network/apn/ApnSettings.java

@@ -322,6 +322,8 @@ public class ApnSettings extends RestrictedSettingsFragment
         final StringBuilder where =
                 new StringBuilder("NOT (type='ia' AND (apn=\"\" OR apn IS NULL)) AND "
                 + "user_visible!=0");
+        // Remove Emergency type, users should not mess with that
+        where.append(" AND NOT (type='emergency')");
 
         if (mHideImsApn) {
             where.append(" AND NOT (type='ims')");