Merge "KeyStorage: don't request rollback resistance for wrapped storage keys" am: ca648a0217 am: 30491f5575 am: 2d0ab31dbb

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

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