Merge "Fix notification stuck on AOD" into qt-r1-dev
am: 08fcdd9877

Change-Id: I6da73ac460ae0994794137598be894cd391759a4