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

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

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



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