Merge "Clear calling identity before calling mountService" into nyc-dev

    private void changeUserKey(int userId, byte[] token, byte[] secret)

            throws RemoteException {

        final UserInfo userInfo = UserManager.get(mContext).getUserInfo(userId);

        getMountService().changeUserKey(userId, userInfo.serialNumber, token, null, secret);

        final IMountService mountService = getMountService();

        final long callingId = Binder.clearCallingIdentity();

        try {

            mountService.changeUserKey(userId, userInfo.serialNumber, token, null, secret);

        } finally {

            Binder.restoreCallingIdentity(callingId);

        }

    }

    @Override