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

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

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



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