Merge from: ag/2217040 Bug: 38029215 Test: make RunSettingsRoboTests Change-Id: Ifefa785b6c56d56da73ca78d874f46efcb9e991f