Merge "Merge "Avoid ANRs in dumpCacheInfo" into tm-dev am: 8dc0bab7 am: 50ee494d am: 5a46b8e4 am: 1be9cd3d"