Merge "Marks Context.createPackageContextAsUser as System"