Merge "Avoid ANRs in dumpCacheInfo" into tm-dev am: 8dc0bab7 am: 50ee494d am: c8d7b7c6

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



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