Bug: 30455784 Test: make SettingsTests; run the instrumentation. Change-Id: I860192c1c20fcaec2a5cbcdc085ff01dafa7351a