Merge "libfscrypt: Add == and != operators for EncryptionPolicy/Options" am: 407d714756

Change-Id: I0b5f5919e29dabeb16c15e0498a23569dd5d919c