Merge "CDD: Strongly recommend audio headset's long/short press actions for android.telecom" into oc-mr1-dev