[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and...

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

Fri, 28 Sep 2018 20:34:53 +0000 (20:34 +0000)

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

Fri, 28 Sep 2018 20:34:53 +0000 (20:34 +0000)
author Android Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 28 Sep 2018 20:34:53 +0000 (20:34 +0000)
committer Android Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 28 Sep 2018 20:34:53 +0000 (20:34 +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>
	Fri, 28 Sep 2018 20:34:53 +0000 (20:34 +0000)
committer	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Fri, 28 Sep 2018 20:34:53 +0000 (20:34 +0000)