Merge "Fix an NPE in PackageManagerService (introduced by ag/3819668)" into pi-dev