Merge "Put the current user to mUsers in UserManagerServiceTest." into udc-qpr-dev am: 837bd198

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23874249



Change-Id: Id67709317b6c492b591388659c55c7a0476acd4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>