[automerger skipped] Merge "Don't set screen state until boot is completed"...

[automerger skipped] Merge "Don't set screen state until boot is completed" into tm-qpr-dev am: 63d87dcb am: 8e2e91c4 -s ours am: 7f029ede -s ours am: b5505650 -s ours

am skip reason: skipped by user wilczynskip

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



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