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

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



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