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

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



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