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

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



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