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

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



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