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

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

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