Merge "Add support for binding storage encryption to a seed" am: 6207c9cde4

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1553317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d60971d77f26bb43a73938895f9e343ced7081a