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: 4adf65b8 am: 93baa04f am: 29c9ecfb

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



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