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

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

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