Android Mainline 12.0.0 Release 63 (7993649,com.google.android.networkstack)
keystore: Fix PEM certs handling am: 7ad2a87249

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

Change-Id: Icc86972299eb9c315ce4353b4d82a841885ed0a2