Merge "Add context UID to package-name-based permission query" into rvc-dev am: ac3c9...

author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Thu, 27 Feb 2020 18:33:41 +0000 (18:33 +0000)

committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Thu, 27 Feb 2020 18:33:41 +0000 (18:33 +0000)
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Thu, 27 Feb 2020 18:33:41 +0000 (18:33 +0000)
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Thu, 27 Feb 2020 18:33:41 +0000 (18:33 +0000)
diff --cc core/java/android/app/ApplicationPackageManager.java
Simple merge
diff --cc core/java/android/permission/PermissionManager.java
Simple merge
author	Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
	Thu, 27 Feb 2020 18:33:41 +0000 (18:33 +0000)
committer	Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
	Thu, 27 Feb 2020 18:33:41 +0000 (18:33 +0000)
		1	2
core/java/android/app/ApplicationPackageManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/permission/PermissionManager.java	patch \|	diff1 \|	diff2 \|	blob \| history