Merge "Move encrypted directories into place already-encrypted" am: ec6e52aa

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



Change-Id: I0937a39d1b09ef4201b9c194543890685784fc77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>