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: 5a0e823c

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



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