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

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

Change-Id: Ia25afd08bb0a0400d24343f37aeea4246f3ec1e8