Merge "Updating Java doc for FLAG_ACTIVITY_RESET_TASK_IF_NEEDED" into sc-dev