am 838b1e22: Merge "Fix NPE in PackageManagerService."

* commit '838b1e2215cbc27e77530f4c79124c088353e0e7':
  Fix NPE in PackageManagerService.