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

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

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