Merge "simpleperf: inject cmd: add build id in AutoFDO output." am: a767bce3eb am: 985c8f59a2

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

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