Bug: 187772493 Test: make SettingsRoboTests Change-Id: If70abf06825a88f0ad0add37ef8d4f46a0aad1e9
d42d9a41f6