[Settings] Core refactor

Remove empty lines, and maintain the comments.

Bug: 150352656
Test: build pass
Change-Id: If0552d7ce20de5941667aa64e682202aaf32c597
1 file changed