[automerger skipped] Merge "Default lockscreen customization on AOSP to...

[automerger skipped] Merge "Default lockscreen customization on AOSP to disabled" into udc-d1-dev-plus-aosp am: 40921c12 -s ours

am skip reason: Merged-In I13f5f498971cbc0a179892881580107e6780419b with SHA-1 5fbc8995 is already in history

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



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