Merge "DO NOT MERGE - Don't 'cmd vibrate' when on DND mode." into oc-dr1-dev am: 9874ab69e5
am: a6d269a1f9

Change-Id: Ieeca4eb77decd34c2da9129b9ba5d40a560f4695