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

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



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