Merge "Keystore 2.0 SPI: Small fix to apease CTS test." am: f246dc6346

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1363de7ca5d2600cfa999627ead673752e43b91