[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: eeab442c -s ours

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

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



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