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

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

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



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