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

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

Change-Id: I43df1d960aba8761f10174710ad2550ee04c9cdb