Merge "Keystore:Expected exception for invalid Keys" am: 4fe1ed8e51 am: d3472b9eed am: 90969f2230 am: 1e6ff36751

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

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