Merge "SettingsLib: Fix assertThat in test"