Merge "Add shard ID to statsd atom for procstats collection" into rvc-dev am: b0f26f32d8 am: a957038ba0 am: b1cc0b3531 am: f44c811d0b

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

Change-Id: I130088507e05ee3ca8bcaba85bc63decfd4c55e7