[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: 36b6ba35 am: 4de47206 -s ours am: 598ef373 -s ours

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

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



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