Bug: 74075761 Test: m RunSettingsRoboTests && manual Change-Id: I286fac5d9390634facc0f04b845ef668c55d1331