Merge "statsd: Add missing AIDs to UidMap"
am: 4593c78168

Change-Id: I011e28206ad267a07d0eb024bcf0d37c622d49d4