Merge "PackageManager: Avoid null access"
am: 9b8008e9e8

Change-Id: Iabb496c276c250ed8edde6da0fe419925f5426e3