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

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

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