Bug: 176945457 Test: atest SettingsUnitTests Change-Id: I25ab3d57c8bf09effcd8aa82a316f64f33d2237a
cd85c64362
d6d12e558c