[automerger skipped] Merge "Fix dump override." into udc-dev-plus-aosp am:...

[automerger skipped] Merge "Fix dump override." into udc-dev-plus-aosp am: 07d2a19a am: 415c2ddf am: 7050e06a -s ours

am skip reason: Merged-In Ida5ff536602691d757fa483a92fc26950be0000d with SHA-1 74e58076 is already in history

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



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