tree 637d50c0f3ce3fd0ce81c05fc2180174820b42f1
parent 97bc46aabd0e67ab0e6aa823ac300dd9cc7f54ed
parent 4c110af013935245b0d7a66eace3d2f6fa8bdf2d
author Seth Moore <sethmo@google.com> 1611711390 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1611711390 +0000

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2d7a8c3538ab8c43e1fe4d783bf2b5d83c826ca