Merge "Delay notification vibration to synchronize with notif sound" into oc-dev
am: 29db4b3556

Change-Id: Icfad056884cfb620cfd27e12146b280a5cb7c300