Merge changes from topic "fscrypt-key-mgmt-improvements"

* changes:
  Export vold ro.crypto.volume.flags property
  Allow vold to use new ioctls to add/remove fscrypt keys