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 am: 7f3d9587

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



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