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

Change-Id: Id85cdfb3d59c25a0df015fc813a2f859b2c23309