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