Merge "Merge "Merge "Small fixes to DumpManager" into udc-dev am: 88debc70...

Merge "Merge "Merge "Small fixes to DumpManager" into udc-dev am: 88debc70 am: 7bc572e3" into udc-qpr-dev am: 5e034623" into udc-qpr-dev-plus-aosp am: c4860313

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



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