Merge "Allow selective detailed dumps of caches" into tm-dev am: 13eb52a2...

Merge "Allow selective detailed dumps of caches" into tm-dev am: 13eb52a2 am: a54c615b am: e8a1c906 am: f5d5dd4d

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



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