Merge "Adding optional block to run before screenshot" into udc-dev am: a6550a83 am: aa7801da am: dc9f549b am: dcf8faf4

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



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