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