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: 5a46b8e4 am: 1be9cd3d

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



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