Revert "track aosp for settings (temp)"

This reverts commit 3b175529c954890768a8a76395f575ea731246e5.