Add CarrierId column in TelephonyProvider

Add a column in provider to migrate mno and mvno to carrierid.

Bug: 115709816
Test: runtest --path tests/src/com/android/providers/telephony/TelephonyProviderTest.java
Change-Id: I9c0c0fd069acc7f182d94f422ff15f45ebf187a9
diff --git a/telephony/java/android/provider/Telephony.java b/telephony/java/android/provider/Telephony.java
index d9e7167..5e4d0ce 100644
--- a/telephony/java/android/provider/Telephony.java
+++ b/telephony/java/android/provider/Telephony.java
@@ -3059,6 +3059,13 @@
         @SystemApi
         public static final int NO_SET_SET = 0;
 
+        /**
+         * A unique carrier id associated with this APN
+         * {@see TelephonyManager#getSimCarrierId()}
+         * <p>Type: STRING</p>
+         */
+        public static final String CARRIER_ID = "carrier_id";
+
     }
 
     /**