Merge "Update settingslib tests to work with tot Robolectric"