Merge "Fix a deadlock in AccountManagerService cause by different paths of code getting the mCacheLock and DB locks in different orders."