[automerger skipped] Merge "Move doze animation until finished waking up" into...

[automerger skipped] Merge "Move doze animation until finished waking up" into udc-dev am: 8014ce81 am: 82a25a04 am: 7ee3fb4b -s ours am: ca044457 -s ours

am skip reason: Merged-In Iea0ee65b2e20b092914d997e948568e5a37c2e0b with SHA-1 86db01e1 is already in history

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



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