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

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

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