Merge "Move back to openssl::X509 in tests" into main am: 807039f66d

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3486350

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