Merge "Fix CSR format for RKPv3" am: 7998ee1339 am: aee3550d99 am: 0f20ae7585

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

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