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

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



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