Merge "Merge "Adding new haptic pattern for ringing incoming calls." into oc-dr1-dev am: 3b4b1f000d am: 68ded012f3" into oc-mr1-dev-plus-aosp