Merge "Consider double tap of the play/pause as the next track" into oc-dr1-dev
am: f05929af73

Change-Id: I6cbcf4485db688a47135b3fe471a14fa78492cea