Merge "Prevent adding a user from lockscreen until a user has signed in" into...

Merge "Prevent adding a user from lockscreen until a user has signed in" into tm-qpr-dev am: c0511060

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



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