Merge "Fix VibratorManagerService cleanup for repeating/long effects" into main