Merge "Include DISABLED_UNTIL_USED components in carrier privilege check." into mnc-dev

     */

    public int getCarrierPrivilegeStatus(PackageManager packageManager, String packageName) {

        try {

            // Include DISABLED_UNTIL_USED components. This facilitates cases where a carrier app

            // is disabled by default, and some other component wants to enable it when it has

            // gained carrier privileges (as an indication that a matching SIM has been inserted).

            PackageInfo pInfo = packageManager.getPackageInfo(packageName,

                PackageManager.GET_SIGNATURES);

                PackageManager.GET_SIGNATURES | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS);

            Signature[] signatures = pInfo.signatures;

            for (Signature sig : signatures) {

                int accessStatus = getCarrierPrivilegeStatus(sig, pInfo.packageName);