Merge "Handle safe mode in PackageManager." into oc-dev am: 89726a1dea
am: 336fa83445

Change-Id: I158517bd402108767c64e0e0f5fb342aee6d4e61