[automerger skipped] Merge "Smooth transition when switching dreaming." into...

[automerger skipped] Merge "Smooth transition when switching dreaming." into tm-qpr-dev am: f932a297 am: 4447541f -s ours

am skip reason: Merged-In I9576470ae0f54d553a0db3aee6fb720edaa5d733 with SHA-1 07723e01 is already in history

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



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