Merge "Default lockscreen customization on AOSP to disabled" into udc-dev am: 8f9666c0

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



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