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

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

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



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