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

Change-Id: Ia6806efa144248a36114b6e65329d60ab960c698