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

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

Change-Id: Ia5dfe5589cf4f1ec8f08ba68fe41b26081fbb934