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

* changes:
  init/fscrypt_init_extensions: support setting v2 encryption policies
  fs_mgr_fstab: support specifying encryption policy version in fstab