Merge "simpleperf: add more device info in recording file." am: b8c63387c5 am: 86832539d1

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

Change-Id: I85c1625a9fc52856f8c195c603a38d18f37e38b7