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

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



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