DO NOT MERGE. No direct Uri grants from system.

author Jeff Sharkey <jsharkey@android.com>

Fri, 3 Feb 2017 00:10:05 +0000 (00:10 +0000)

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

Fri, 3 Feb 2017 00:10:05 +0000 (00:10 +0000)
author Jeff Sharkey <jsharkey@android.com>
Fri, 3 Feb 2017 00:10:05 +0000 (00:10 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:10:05 +0000 (00:10 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Jeff Sharkey <jsharkey@android.com>
	Fri, 3 Feb 2017 00:10:05 +0000 (00:10 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 3 Feb 2017 00:10:05 +0000 (00:10 +0000)