Merge "AOD clock and notification animation" into pi-dev
am: 22db17a97a

Change-Id: I4060191b2adc0ee0b9cd6aeee96a90ac09243c6b