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

Change-Id: I16fbc54e9c50b2c05dacf0ee34fe7d4b01670e21