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

Change-Id: I16bcdd7587688513273df3dc16a8b412288c00d4