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

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

Change-Id: Icb61c8df0bef295ccf98a13318ab9fb0492e0f7b