Merge "Update exception thrown for keystore" into main am: a7f6cb18 am: 242534fe

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



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