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