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

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

Change-Id: Ic7e96c998e87d563f997fd81a5ebbfa809d29c85