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