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

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

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



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