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

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

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