Merge "Add Flaky annotation to 4 flaky tests in VibratorManagerServiceTest" into main