Merge "Only delay wake-up animation if AOD is enabled" into udc-qpr-dev am: 67dd5a0c

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



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