Merge "Fix cryptfs RSA signing with keystore2" am: d2bb367549

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

Change-Id: Ib91a29bf3d216c09ece619b9554c8f391efbe5fd