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

Change-Id: I0433a434f1e21f92f36c4e54fa8d0aee9208ebc7