AOD: Fix flicker at end of AOD2

Fixes a flicker at the end of pulsing out. Instead of the hard cut
we animate out and then hard cut to AOD1.

Change-Id: I64149bb734c10e07e3da2822548a4651b9fb48db
Fixes: 64077859
Test: Receive notification, let it time out; verify no flicker at end of fading out.
(cherry picked from commit 2b192ec5)