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

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



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