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

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



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