Merge "Fix issue with task snapshots being taken too late" into udc-dev am:...

Merge "Fix issue with task snapshots being taken too late" into udc-dev am: d71d712e am: 443d0ab1

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



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