Merge "Fix dump override." into udc-dev-plus-aosp am: 07d2a19a am: 415c2ddf

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



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