Merge "Introduce VibratorEnvelopeEffectInfo class" into main