Merge "Handle unparsable public keys" am: b43409fb am: a3442806 am: 7650484e

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



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