Merge "pprof_proto_generator: Set units for common events" am: 3f58f74f03 am: 38198a762a

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

Change-Id: Iea1b3c4199c00667383bb030b8e84f05ac24a4b2