Only delay wake-up animation if AOD is enabled

Bug: 286880921
Bug: 285570694
Bug: 193615254
Test: Disable AOD, use analog clock, turn screen off then on. Ensure
      that analog AOD clock does not briefly flicker on display.
Change-Id: I36707ca64cab8c7c719a9665ae3e494fb3307ee8
Merged-In: I36707ca64cab8c7c719a9665ae3e494fb3307ee8