Merge "Update exception thrown for keystore" into main am: a7f6cb180d am: 242534fe61 am: 0b37e75b10

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

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