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

Change-Id: I55febaacfae0a37979cebee7932e7859df2d2f78