Merge "KeyStorage: don't request rollback resistance for wrapped storage keys" am: ca648a02

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



Change-Id: I77397b7fe7b8d25db567e5b8ea9570fd98aca28c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>