am f1fff797: Merge "Add flag FLAG_ACTIVITY_RESET_TASK_IF_NEEDED in LauncherAppsService." into mnc-dev

* commit 'f1fff7976937d92bc7e0014d54cb071a509975dc':
  Add flag FLAG_ACTIVITY_RESET_TASK_IF_NEEDED in LauncherAppsService.