Merge "Fix CSR format for RKPv3" am: 7998ee1339

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

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