Merge "Avoid ANRs in dumpCacheInfo" into tm-dev am: 8dc0bab7 am: d6e8f8a6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18717283



Change-Id: Ib5015b4354068b8899e4390e9839d34049d5787b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>