Merge "Small fixes to DumpManager" into udc-dev am: 88debc70 am: e4987a88 am: 40e360e8

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



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