Merge "Move settingslib testutils to its own target"