Update default.xml

Reverted to old frameworks_base and packages_apps_Settings