Merge "Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase." am: be1b1d5550

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

Change-Id: Id4280de7e3f6f6693e0d03c901f4e9665803b92b