Merge changes Icbc040f7,I87b237ff into rvc-dev

* changes:
  FileBasedEncryptionPolicyTest: test for non-reversible FBE key derivation
  FileBasedEncryptionPolicyTest: only allow custom modes on old devices