Merge "Notify caller when unlockUser() bails out" am: e7df4aa57c am: 030f2bd0ac

author Rubin Xu <rubinxu@google.com>

Tue, 19 Mar 2019 18:48:32 +0000 (11:48 -0700)

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

Tue, 19 Mar 2019 18:48:32 +0000 (11:48 -0700)
author Rubin Xu <rubinxu@google.com>
Tue, 19 Mar 2019 18:48:32 +0000 (11:48 -0700)
committer android-build-merger <android-build-merger@google.com>
Tue, 19 Mar 2019 18:48:32 +0000 (11:48 -0700)
diff --cc services/core/java/com/android/server/am/UserController.java
Simple merge
author	Rubin Xu <rubinxu@google.com>
	Tue, 19 Mar 2019 18:48:32 +0000 (11:48 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 19 Mar 2019 18:48:32 +0000 (11:48 -0700)