Merge "[flexiglass] Lock screen -> Lockscreen." into udc-dev am: 32becff057

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

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