Merge "Add "thread" label to pprof_proto_generator" am: 078d73d307 am: 9ad241b6d8

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

Change-Id: I97219cd3e462f855f9b361214f4816d6adec8fd2