Merge "Add isEmergencyApn" am: 660a94aea9 am: 01493ff22b

Change-Id: I5fa0fa0b21db4c9796a0f0a3e15526eca285c7f8

telephony/java/android/telephony/data/ApnSetting.java

@@ -1055,6 +1055,11 @@ public class ApnSetting implements Parcelable {
         return (mApnTypeBitmask & type) == type;
     }
 
+    /** @hide */
+    public boolean isEmergencyApn() {
+        return hasApnType(TYPE_EMERGENCY);
+    }
+
     /** @hide */
     public boolean canHandleType(@ApnType int type) {
         if (!mCarrierEnabled) {