Merge "Factor some RestrictedLockUtils out of SettingLib"