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

Merge "Keystore 2.0 SPI: Small fix to apease CTS test." am: f246dc63 am: b30a7eb0 am: 69ffb7d1 am: e352e1f9 am: 2781f6bf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie74ab2d2b59d38501dfcff7e7e4be72548472a24