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

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



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