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

* changes:
  vold: support v2 encryption policies
  vold: use new ioctls to add/remove fscrypt keys when supported