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 am: 15a39748

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



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