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

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

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