Bug: 73960246 Test: Manual test & make RunSettingsRoboTests Change-Id: I6eb5fbed20a4ffc923faf992bbf0b30a817444a0