Merge "Skip updating the leash if a task is removed prior to sync completion"...

Merge "Skip updating the leash if a task is removed prior to sync completion" into tm-qpr-dev am: e2574c8d am: ce469ce5 am: 17758ea5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21553210



Change-Id: I71cca0b4f462528c8c7c4df4bd9904d1a66b031d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>