Merge "Don't set screen state until boot is completed" into tm-qpr-dev am: 63d87dcb

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



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