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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86c5c808f585ff6a721f233b69d44826a44bd5fa