[automerger skipped] Merge "Only delay wake-up animation if AOD is enabled"...

[automerger skipped] Merge "Only delay wake-up animation if AOD is enabled" into udc-dev am: 7a6b4852 am: ba7950a5 -s ours am: 2cb3c45a -s ours am: 6c259dca -s ours

am skip reason: Merged-In I36707ca64cab8c7c719a9665ae3e494fb3307ee8 with SHA-1 c1570bab is already in history

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



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