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

[automerger skipped] Merge "KeyStorage: don't request rollback resistance for wrapped storage keys" into tm-qpr-dev am: 68734604 -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: I899a8ab81db246ce29293c706f2bc30e01cb649f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>