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

Change-Id: Id9556b83a77bd20f76b351b7048af8cb5fb717f7