Revert Track omnirom's 

frameworks_base & packages_apps_settings