Merge "RESTRICT AUTOMERGE Use getLaunchedFromPackage instead of getCallingPackage" into udc-dev

        final Intent launchingIntent = getIntent();

        mReviewGrantedConsentRequired = launchingIntent.getBooleanExtra(

                EXTRA_USER_REVIEW_GRANTED_CONSENT, false);

        mPackageName = getCallingPackage();

        mPackageName = getLaunchedFromPackage();

        // This activity is launched directly by an app, or system server. System server provides

        // the package name through the intent if so.

        if (mPackageName == null) {

        if (getCallingPackage() == null)  {

            if (launchingIntent.hasExtra(EXTRA_PACKAGE_REUSING_GRANTED_CONSENT)) {

                mPackageName = launchingIntent.getStringExtra(

                        EXTRA_PACKAGE_REUSING_GRANTED_CONSENT);