Bug: 188046672 Test: make SettingsRoboTests Change-Id: I1716913eee7c93cafd622052dcbca940c9726a17
d42d9a41f6