Use '=' for conflicts that are hit with '!='

We can't use '==' as thats not valid spec file
conflicts version syntax, using '=' is though.

Change-Id: I6040b939f3e620490daca0751cdef1b9b6365ecb
Merge "Use '=' for conflicts that are hit with '!='"