Fix conflict between MMVD and constraint on 4x4 bi-pred

1 job for master
Status Job ID Name Coverage
  External
passed jenkins