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

Change-Id: I69a6f48e46bcbd7ed03057ce0c18002f6ecdd576