keystore: Fix PEM certs handling am: 7ad2a87249 am: 84da89dff4

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/15433405

Change-Id: I68865cc8142c3253135436224731157c69d6c96f