Merge "PackageManager: Avoid null access" into pi-dev
am: 4471849dab  -s ours

Change-Id: If9d2e279f5e12646097ee43ab03fb1878994ae97