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

Change-Id: I50631821a385b8c7a8b2889f392e5a1dce994517