[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 skip reason: skipped by user wilczynskip

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



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