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

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



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