Merge "Exclude dumpsys from incident in dumpstate" am: 6e1ac191 am: faef3a82

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



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