Merge "Handle unparsable public keys" am: b43409fbfc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2373248

Change-Id: If56db24abfac9de40cdfe251a5070a5821aa4037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>