Merge "Fix for the following flaky tests: VibrationThreadTest#vibrate_singleWaveformWithAdaptiveHapticsScaling_scalesAmplitudesProperly VibratorManagerServiceTest#vibrate_withAdaptiveHaptics_appliesCorrectAdaptiveScales" into main