Merge "Improve swiping to reveal gear for ongoing notifications with time...
Merge "Improve swiping to reveal gear for ongoing notifications with time check" into nyc-mr1-dev am: be9d8e62 am: 544a5747
am: b3e694e1
Change-Id: I9fa9d0e8edda963e6c4ddff20038344d91fe2697