Revert "WIP Settings cleanup.....more coming tonight"

Please only fix errors we introduced... if a file on github's last change was an aosp commit, plz just leave it as is. No need to diverge from aosp unnecessarily.

This reverts commit 78ee8f3709f432cf40b3cbdc6dbc4b31fab22b30.

Change-Id: Ib0dca39a597e7817f6e0d2a811fc1174c5c6b221