[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 udc-dev am: 51d5db8c -s ours am: 45477c07 -s ours

am skip reason: Merged-In I11f65f008791470b00a1677beab3f6168589608f with SHA-1 39516388 is already in history

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



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