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
Change-Id: I8f6b70c566121cdef110fb16c57cc1106281d8dc