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

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

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