Merge "Use SettingsRobolectricTestRunner in settings app"