Merge "Changes the vibrator_manager shell commands to block until the end of...

Merge "Changes the vibrator_manager shell commands to block until the end of the vibration by default, and adds a -B option to give the old behaviour of just initiating the vibration."