Merge "Allow dumpstate to snapshot traces and attach them to bug reports" am: 9dd873d725 am: 8b1052f357

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/1542764

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2516a3703924e87b80f92cf51f2d33070a4609a1