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

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

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



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