Merge "MetadataCrypt: extend timeout for low performance device" am:...

Merge "MetadataCrypt: extend timeout for low performance device" am: c2b0578e am: a38a2fa3 am: 3f265216

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



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