Merge "Added artd to the UID map" am: 5389ee19b4 am: 6ac4ab1f28 am: b4b259eabb

Original change: https://android-review.googlesource.com/c/platform/packages/modules/StatsD/+/1663787

Change-Id: Ia8a961320ccca6cd08290d5b10a7455494241a27