Merge "Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest."