Merge "Move doze animation until finished waking up" into udc-qpr-dev am: 46a3050cbf am: 2eb39efe3b

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

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