Merge "Move doze animation until finished waking up" into udc-dev am: 8014ce81be

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

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