Merge "Change getPackageUid to getPackageUidAsUser" am: f1324dcace am: a96e3dfb81
am: 1c1e2b5b52

Change-Id: I3929e2816f00951cc5b3611ed6884e816b66c0bf