Merge "Keystore:Expected exception for invalid Keys" am: 4fe1ed8e51

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

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