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

Change-Id: I7a94d6c84053932be7eacc0ae3536dd2cfdd670c