[automerger] Merge "Allow unsuspending critical packages" into pi-dev am: 5c4b2f6e08...

author Android Build Merger (Role) <noreply-android-build-merger@google.com>

Tue, 12 Jun 2018 21:39:36 +0000 (21:39 +0000)

committer Android Build Merger (Role) <noreply-android-build-merger@google.com>

Tue, 12 Jun 2018 21:39:36 +0000 (21:39 +0000)
author Android Build Merger (Role) <noreply-android-build-merger@google.com>
Tue, 12 Jun 2018 21:39:36 +0000 (21:39 +0000)
committer Android Build Merger (Role) <noreply-android-build-merger@google.com>
Tue, 12 Jun 2018 21:39:36 +0000 (21:39 +0000)
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Tue, 12 Jun 2018 21:39:36 +0000 (21:39 +0000)
committer	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Tue, 12 Jun 2018 21:39:36 +0000 (21:39 +0000)