Merge "Put package name in extra not data" into qt-qpr1-dev

author Philip P. Moltmann <moltmann@google.com>

Wed, 25 Sep 2019 18:24:00 +0000 (11:24 -0700)

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

Wed, 25 Sep 2019 18:24:00 +0000 (11:24 -0700)
author Philip P. Moltmann <moltmann@google.com>
Wed, 25 Sep 2019 18:24:00 +0000 (11:24 -0700)
committer android-build-merger <android-build-merger@google.com>
Wed, 25 Sep 2019 18:24:00 +0000 (11:24 -0700)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Philip P. Moltmann <moltmann@google.com>
	Wed, 25 Sep 2019 18:24:00 +0000 (11:24 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 25 Sep 2019 18:24:00 +0000 (11:24 -0700)
		1	2
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/PackageManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history