Merge "Add shard ID to statsd atom for procstats collection" into rvc-dev am: b0f26f32 am: c3f595fd am: 917b1d06

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

Change-Id: Ic55225e3d3f97edd07f256e7db72635d1544105f