Merge "Remove flaky annotation from VibratorManagerServiceTest tests" into main