Merge "MetadataCrypt: remove unnecessary retry loop" am: 80fdc5a4e3 am: 5a1e03f705

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

Change-Id: I5211d2aba15fcd8e201862428f79eb282ecff889