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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib170c14dfa40e7cf7badfec632cbf42b8c5d4b0b