Merge "Move screenshotting of the task earlier prior to the display change" into udc-dev am: d35494579a am: 5a0e823ccc

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

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