Merge "dumpstate: save background traces when a BR is captured." am: 8592b080ec am: 069ec16537

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1516517

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd6a9e1676c69b8f2af0117351366983600e720e