Merge "simpleperf: fix pprof_proto_generator.py for proguard mapping file." am: 55c3b615d6

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

Change-Id: I7cde85643dcac0249141873463ab92a05bb94f7c