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

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



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