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

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



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