Merge "Adds CTS tests for uid map for statsd." into pi-dev