Merge "simpleperf: fix pprof_proto_generator.py." am: c9c8899421 am: 1b6f065d98

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

Change-Id: I0c92351f8bc2338abf69025cde15f3efdac599d0