Merge "populate attributes when re-writing perf data" am: 0695b96133

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2113793

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