Merge "Handle safe mode in PackageManager." am: a34610cebc
am: 2ea3874427

Change-Id: I18f16e094d96bd754c8ff0a8031450ce1a1ce023