Merge "Remove conversion from uid to package name  getAccountsFromCacheLocked"