Merge "Fix parsing certificate with fallback to PEM." into sc-dev am: 861703995c am: 2edd3c0572

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/hardware/interfaces/+/15567011

Change-Id: Ie7ae80f1b4a577de4b03e625462c9e3868e38e3e