Merge "Handle safe mode in PackageManager." into oc-dev am: a6a73ff55a
am: f75a7a6200

Change-Id: I5a75b51be11e484099764d20a348fdd20c959019