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

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

Change-Id: Ib9ae666d3cefe1cbd6d52ead5c1996632087b9ff