Merge "Handle keystore keys that are missing certificates." am: f44834ab28

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1670632

Change-Id: I7db0fe415f6bb638263e1e56c4be33f530871fee