Merge changes from topic "caitlinshk-csi-setlockscreenuser" into udc-qpr-dev am: 11f114e4

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



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