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

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

Change-Id: I130088507e05ee3ca8bcaba85bc63decfd4c55e7