Bug: 31002801 Test: make RunSettingsRoboTests Also tested manually in app. Change-Id: I7496d9910657600c381202c0f3f78315e2de42ad