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

Change-Id: Id5bd7fdd238482ad0265feac78636adaf4e2a1fb