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

Change-Id: Iee0dddf786339681a9ded099316b9334e9ac79bd