Merge "Reduce duration of AOD headsup" into qt-r1-dev am: e03623cee0
am: 97089c67d8

Change-Id: I708e45b530d271e79e8dfd199ff95bcdab893424