Merge "Create CombinedVibrationEffect.aidl"