Merge changes from topic "caitlinshk-csi-setlockscreenuser" into udc-qpr-dev...

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

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



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