[automerger skipped] Merge "Don't set screen state until boot is completed" into udc-dev am: 51d5db8c28 -s ours
am skip reason: Merged-In I11f65f008791470b00a1677beab3f6168589608f with SHA-1 3951638857 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21476246
Change-Id: I1a8466b797c5aa0b72c27ff0bbdc6644dff0a720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: