Merge "Reduce unnecessary screenshot when display is not on" into udc-dev am: be1ffcd9

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



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