Merge "Review of suspend/unsuspend APIs" into pi-dev

author Suprabh Shukla <suprabh@google.com>

Wed, 11 Apr 2018 07:55:38 +0000 (00:55 -0700)

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

Wed, 11 Apr 2018 07:55:38 +0000 (00:55 -0700)
author Suprabh Shukla <suprabh@google.com>
Wed, 11 Apr 2018 07:55:38 +0000 (00:55 -0700)
committer android-build-merger <android-build-merger@google.com>
Wed, 11 Apr 2018 07:55:38 +0000 (00:55 -0700)
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Suprabh Shukla <suprabh@google.com>
	Wed, 11 Apr 2018 07:55:38 +0000 (00:55 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 11 Apr 2018 07:55:38 +0000 (00:55 -0700)