Merge "Use metadata_key_dir instead of metadata_encryption" am: 389e5c114d am: 4e6e027086 am: 71fc1fb76e

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

Change-Id: I764a9ca61523bf5aa0437d2e7432a2222d4af27f