Merge "Merge "Avoid ANRs in dumpCacheInfo" into tm-dev am: 8dc0bab75e am: 50ee494d30 am: 5a46b8e45c am: 1be9cd3d1f"