Merge "Change getPackageUid to getPackageUidAsUser"
am: f1324dcace

Change-Id: Id066f5da185ed7a699cc9fd3c8d477f00d9293c5