Merge "pprof_proto_generator: friendlier sample_types" am: 149e735479 am: 74558cbfdc

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

Change-Id: I5205b1c9d2f54d02074996b7b94fe6bbcfdb15bb