Merge "Merge "Add shard ID to statsd atom for procstats collection" into...

Merge "Merge "Add shard ID to statsd atom for procstats collection" into rvc-dev am: b0f26f32 am: ddd439cf" into rvc-d1-dev-plus-aosp am: 0370e42b am: 5c163f44

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11971040

Change-Id: Iad67e8ceddf67e04416d0bda39a94012b276f70d