Merge "Fix ill-formed certificate request" into sc-dev am: a9b1547411

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

Change-Id: I17b3b985274f2c426baa71ac0c45172a2fb17b21