Merge "DO NOT MERGE: Fix several issues with precreated users." into qt-qpr1-dev

author Jovana Knezevic <jovanak@google.com>

Mon, 11 Nov 2019 23:13:57 +0000 (23:13 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 11 Nov 2019 23:13:57 +0000 (23:13 +0000)
author Jovana Knezevic <jovanak@google.com>
Mon, 11 Nov 2019 23:13:57 +0000 (23:13 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 11 Nov 2019 23:13:57 +0000 (23:13 +0000)
diff --cc core/java/android/os/UserManager.java
Simple merge
diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge
author	Jovana Knezevic <jovanak@google.com>
	Mon, 11 Nov 2019 23:13:57 +0000 (23:13 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 11 Nov 2019 23:13:57 +0000 (23:13 +0000)
		1	2
core/java/android/os/UserManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/PackageManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history