Merge "Keystore SPI: Fix typos." am: 881b75d3ed am: b0421a53b2

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

Change-Id: I4f925b1b601b3c9b11d162bd08cf1066a0db21e6