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

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

Change-Id: I04183c848ea9f6974b7e16412b6225c3666d9d9f