[automerger skipped] Merge "AOD clock and notification animation" into pi-dev am: 22db17a97a
am: 4aff70df64  -s ours

Change-Id: Ie0e43c34d80ba0f0aea31f2a18a0aa0bac0d269b