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

* commit '26b5ec6bddb7ae406eda74c7a539195a5520b6b8':
  Add flag FLAG_ACTIVITY_RESET_TASK_IF_NEEDED in LauncherAppsService.