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

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

Change-Id: I8d495671269aea54eccd1d5745676eac6b49489d