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

Change-Id: I8281c6aa2f84f6b0401e1c14cc0d027312101db4