Merge changes from topic "cpcpcp"

* changes:
  move encodeException to non-updatable framework/base/telephony/common
  move IApnSourceService.aidl to android.service.carrier
  use SmsCbMessage.MESSAGE_FORMAT_3GPP to replace hidden SmsMgr APIs
  apply correct @SystemAPI for PackageManager

core/java/android/service/carrier/ApnService.java

@@ -26,7 +26,7 @@ import android.content.Intent;
 import android.os.IBinder;
 import android.util.Log;
 
-import com.android.internal.telephony.IApnSourceService;
+import android.service.carrier.IApnSourceService;
 
 import java.util.List;
 

core/java/android/service/carrier/IApnSourceService.aidl

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.internal.telephony;
+package android.service.carrier;
 
 import android.content.ContentValues;
 
+/** @hide */
 interface IApnSourceService {
     /** Retreive APNs. */
     ContentValues[] getApns(int subId);

telephony/common/com/android/internal/telephony/SmsApplication.java

@@ -305,7 +305,7 @@ public final class SmsApplication {
                 Uri.fromParts(SCHEME_SMSTO, "", null));
         List<ResolveInfo> respondServices = packageManager.queryIntentServicesAsUser(intent,
                 PackageManager.MATCH_DIRECT_BOOT_AWARE | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
-                UserHandle.getUserHandleForUid(userId));
+                UserHandle.of(userId));
         for (ResolveInfo resolveInfo : respondServices) {
             final ServiceInfo serviceInfo = resolveInfo.serviceInfo;
             if (serviceInfo == null) {

telephony/java/android/telephony/SmsManager.java

@@ -79,11 +79,6 @@ public final class SmsManager {
             SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);
     private static final Object sLockObject = new Object();
 
-    /** @hide */
-    public static final int CELL_BROADCAST_RAN_TYPE_GSM = 0;
-    /** @hide */
-    public static final int CELL_BROADCAST_RAN_TYPE_CDMA = 1;
-
     /** SMS record length from TS 51.011 10.5.3
      * @hide
      */