Merge "Move restricted padlock support to SettingsLib"