Merge "vold: Generate storage key without rollback resistance" am: 4f5e9c196f

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

Change-Id: Ibf06476010946d799c4b1fa5143ed4eac96f301a