am 506b68e1: Merge "Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY"

* commit '506b68e1c586ea3956c939c4181f11e5a112a2f5':
  Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY