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

Change-Id: I567737d362b7445f952a499b41b4ec2a8cd4383a