Merge "Remove SettingsRobolectricTestRunner"