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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idc461fac1698ab72d6fc7ce2b692197fc0f38f6b