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

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

Change-Id: Id26dbda854480c74d07fcec87f1d045325bf625a