[Settings] Code refactor

Bug: 147338143
Test: build pass
Change-Id: Ib4a92f659ceda3584310591f706958a06ba5ab21
2 files changed