Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread