[automerger skipped] Merge "Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase." am: be1b1d55 am: 1ade004e am: 6f06dae1 -s ours

am skip reason: skip tag Change-Id Idc9c7dc2614a47818227a06fe76078f72c0c1f57 with SHA-1 a1963a9b is already in history

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

Change-Id: I8333348d82801b0a2b040f3f38cfa4ae6287c873