Merge "Do not report AOD as showing when fading away" into qt-r1-dev
am: 35d4eee0b6

Change-Id: I7f6b569acc6d0cb96525f63cb6f553b21604b626