Merge "Move permission-by-UID check earlier" into main

    private static int checkPermissionUncached(@Nullable String permission, int pid, int uid,

            int deviceId) {

        final IActivityManager am = ActivityManager.getService();

        if (am == null) {

            // Well this is super awkward; we somehow don't have an active ActivityManager

            // instance. If we're testing a root or system UID, then they totally have whatever

            // permission this is.

        final int appId = UserHandle.getAppId(uid);

        if (appId == Process.ROOT_UID || appId == Process.SYSTEM_UID) {

                if (sShouldWarnMissingActivityManager) {

                    Slog.w(LOG_TAG, "Missing ActivityManager; assuming " + uid + " holds "

                            + permission);

                    sShouldWarnMissingActivityManager = false;

                }

            return PackageManager.PERMISSION_GRANTED;

        }

        final IActivityManager am = ActivityManager.getService();

        if (am == null) {

            // We don't have an active ActivityManager instance and the calling UID is not root or

            // system, so we don't grant this permission.

            Slog.w(LOG_TAG, "Missing ActivityManager; assuming " + uid + " does not hold "

                    + permission);

            return PackageManager.PERMISSION_DENIED;