Merge "Allow canceled draws to get retried for sync" into tm-qpr-dev am: de765a95 am: caff4c4c

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



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