Merge "Default lockscreen customization on AOSP to disabled" into udc-dev