Update default.xml

Reverted to AOSP frameworks_base and packages_apps_Settings