[automerger skipped] Merge "Move doze animation until finished waking up" into udc-dev am: 8014ce81be am: 35c16fe729 -s ours

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

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

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