Merge "Add pid & tid labels to pprof_proto_generator.py" am: 64fcbf7c09 am: e6b1e40fc3

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

Change-Id: Ibc244a44fe57e0aa8e34d04f0f7c743a84fe248b