Merge "Remove com.android.settings.action.SETTINGS" into main