Merge "Keystore 2.0 engine: Handle legacy PEM certificates." am: 4ef2802a9b

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

Change-Id: I7a6c3ee48ef070dacb9e3d9cc5daf8c5a701d627