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

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

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



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