Merge "Avoid ANRs in dumpCacheInfo" into tm-dev