Rearrange Settings dependencies

Bug: 285231003
Test: m Settings
Change-Id: Id5adab7d9a24265b98db9959c30904e82ad60dd4
1 file changed