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

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

Change-Id: Ibac041c22ac892e2cf3c9dc1f6aff564df9fc1f6