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

Change-Id: I0b6a805da129b89a3c4e8e1243ace17312fa202f