Merge "Allow BcKeyStoreException to be throw in KeyStoreTest." am: 3d3a0846a9 am: 7bcaa7f677

Original change: https://android-review.googlesource.com/c/platform/cts/+/1621145

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4daac4c305f0f9eff10d2e1d19c3fc9dd546fb92