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

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

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



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