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: 58948205 am: f6cb3dbc am: ed6214f9

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



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