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 am: 2ffdefc4 am: f6bad3cd

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



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