Merge "Move some RestrictedLockUtils out of SettingLib"