Merge "Handle safe mode in PackageManager."
am: 7a45fd929a

Change-Id: Icd7bf11cb3bdc3acdf3414a3ba13cd7964e13f3b