Fix failing tests

Fix existing tests broken by UidMap changes

Bug: 219756810
Test: statsd_test
Ignore-AOSP-First: Fix merge conflict
Change-Id: I6547aed0996ba2d6ad91cbd77482d4005b36e440
7 files changed