Merge "[Settings] Remove unused code from AOSP"