[automerger skipped] Merge "Don't set screen state until boot is completed" into tm-qpr-dev am: 63d87dcbe9 am: 8e2e91c411 -s ours am: 7f029edeac -s ours
am skip reason: skipped by user wilczynskip Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21264319 Change-Id: Icdb938f9441cfbdfb9388bf4393a4722b10ca8c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: