Merge "pprof_proto_generator: friendlier sample_types" am: 149e735479

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

Change-Id: I4d20960058d962d159edf4f87129336d420f127d