[automerger skipped] Merge "Only delay wake-up animation if AOD is enabled" into udc-dev am: 7a6b4852bb am: 36b6ba35b5 -s ours
am skip reason: Merged-In I36707ca64cab8c7c719a9665ae3e494fb3307ee8 with SHA-1 7734c763ed is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23679899
Change-Id: I4a2aecb5cab44d4ba46858613d59c7f14c141d84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: