Merge "Ignore failing test of FactoryResetPreferenceControllerTest" into main