Merge "Merge "Stop timer when notification isn't visible" into qt-dev am: 7256c379df am: 8594033be0" into qt-r1-dev-plus-aosp
am: 302f96fe81

Change-Id: Ia0e3c66df77d329a5445dcad1a928806f2b113c7