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

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



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