[automerger skipped] Merge "Avoid lock screen flash when going to dream." into tm-qpr-dev am: cf4c1a62a6 am: e1544936b5 -s ours

am skip reason: Merged-In I89ecce9cc39cb1cb6f7b19068908ba436643223c with SHA-1 77e35e9edd is already in history

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

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