Merge "Lock default display when it sleeps independent of global wakefulness"...

Merge "Lock default display when it sleeps independent of global wakefulness" into tm-dev am: 68eab3f1

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



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