Merge "Fix flaky VibratorManagerService test" into sc-dev