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 am: 73ff9c51 am: d1df3a81

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



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