Merge "Don't lock database when token is read from customToken cache in AccountManagerService."

            String tokenType,

            String callingPackage,

            byte[] pkgSigDigest) {

        synchronized (accounts.dbLock) {

        synchronized (accounts.cacheLock) {

            return accounts.accountTokenCaches.get(

                    account, tokenType, callingPackage, pkgSigDigest);

        }

    }

    }

    /** protected by the {@code dbLock}, {@code cacheLock} */

    protected void writeAuthTokenIntoCacheLocked(UserAccounts accounts,