Merge "Keystore 2.0 SPI: Fix various CTS failures." am: b660e617df

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib01d678ed93829e65cb685076d177327ecb1baad