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

Change-Id: I71dc793457b9f04d91d1863e2a33c70936c63ebd