Merge "CDD: Require double-tap play/pause to be mapped to next track." into oc-mr1-dev
am: 50f7b18420

Change-Id: I52bdc272d4972d1caa153af55eb1eeeed3c6f045