Merge "Package checks for resloving recovery tokens should be user sensitive." into klp-dev

                 * this can be very bad when those apps are in the system like

                 * the System Settings.

                 */

                int authenticatorUid = Binder.getCallingUid();

                long bid = Binder.clearCallingIdentity();

                try {

                    PackageManager pm = mContext.getPackageManager();

                ResolveInfo resolveInfo = pm.resolveActivity(intent, 0);

                    ResolveInfo resolveInfo = pm.resolveActivityAsUser(intent, 0, mAccounts.userId);

                    int targetUid = resolveInfo.activityInfo.applicationInfo.uid;

                int authenticatorUid = Binder.getCallingUid();

                    if (PackageManager.SIGNATURE_MATCH !=

                            pm.checkSignatures(authenticatorUid, targetUid)) {

                        throw new SecurityException(

                                "Activity to be started with KEY_INTENT must " +

                               "share Authenticator's signatures");

                    }

                } finally {

                    Binder.restoreCallingIdentity(bid);

                }

            }

            if (result != null

                    && !TextUtils.isEmpty(result.getString(AccountManager.KEY_AUTHTOKEN))) {