Bug: 243899654 Test: manual & m RunSettingsRoboTests Change-Id: I5ae5b604894c53e0e816f7a244104321e22c12de