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

Change-Id: I64bb4c9763dd66060495a21c63c1e0ca0057ea3f