Merge "Merge "Stop timer when notification isn't visible" into qt-dev am: 7256c379df am: 6d122f1837" into qt-r1-dev-plus-aosp am: 03a2bdd29c
am: 793bca0795

Change-Id: I00de14820ab386773a459fe4104873e2ebdf8780