Bug: 195306545 Test: make SettingsRoboTests Change-Id: Iccb3530c40bc32c20d74d65aa3f26eb2d6719106
6a3b697141