Merge "Use metadata_key_dir instead of metadata_encryption" am: 389e5c114d

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1908137

Change-Id: Ieb7f82d0f3531975ca06d88894610d4ead9dc52c