Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev
am: ecab20d852

* commit 'ecab20d852826286e4d9d8c095ef61cebbb0ab4e':
  Add check for Vibration RingerMode in VibratorService

Change-Id: Iaab0a9006897ba57e25be58723c96f2bc214df71