[automerger skipped] Default lockscreen customization on AOSP to disabled am: 1ad9f278 -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: I0a20f418b6a65f5a125f14f281720c0532ab1acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>