* commit 'b78a0a111f7a52954eea6bdba5ade08870cee035': Ensure ApplicationInfo is for correct user for system/android package.