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

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

Change-Id: I02bf9412685cd1cd0b3bef6783035b9017fce337