Merge "Add ROLLBACK past signing cert capability." into pi-dev

author Daniel Cashman <dcashman@google.com>

Tue, 3 Apr 2018 02:16:09 +0000 (19:16 -0700)

committer android-build-merger <android-build-merger@google.com>

Tue, 3 Apr 2018 02:16:09 +0000 (19:16 -0700)
author Daniel Cashman <dcashman@google.com>
Tue, 3 Apr 2018 02:16:09 +0000 (19:16 -0700)
committer android-build-merger <android-build-merger@google.com>
Tue, 3 Apr 2018 02:16:09 +0000 (19:16 -0700)
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Daniel Cashman <dcashman@google.com>
	Tue, 3 Apr 2018 02:16:09 +0000 (19:16 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 3 Apr 2018 02:16:09 +0000 (19:16 -0700)