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

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

Change-Id: Iaab2239444df05a089224bd145fe6d9c4baee436