Merge "Add shard ID to statsd atom for procstats collection" into rvc-dev am: b0f26f32d8 am: c3f595fd8c am: 46792fe619 am: fe211e4f5d

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

Change-Id: I60634b1ffaedb7219e42cd5962913d83aeea39a1