Merge "Fix the app ops settings tests by adding FLAG_ACTIVITY_NEW_TASK to Intents."