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

Change-Id: I022dc4b09a0b14885a297c9dd25a5cf01b8a1e76