Merge "Update exception thrown for keystore" into main am: a7f6cb180d

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

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