Merge "Move screenshotting of the task earlier prior to the display change"...

Merge "Move screenshotting of the task earlier prior to the display change" into udc-dev am: d3549457 am: ca8a9e0f am: 0416464f am: 48c9cfe7

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



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