Merge "Reinstate most dumpsys sections in incident" am: ab5f05d0 am: e4a3a0a6

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



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