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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7706914938cffb19ed1f5f9f9f63842f8329ec8