[automerger skipped] KeyStorage: don't request rollback resistance for wrapped...

[automerger skipped] KeyStorage: don't request rollback resistance for wrapped storage keys am: e11788d0 -s ours

am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890 is already in history

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



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