Fix a few tests

Test: Run SettingsLib tests
Fix: 206425424
Change-Id: I0f9c1040a191d90b2729ddc5318ae90f1ca20f00
2 files changed