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

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



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