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

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

Change-Id: I45b3fa790de4fdbcdf58b96ffcae72a92414bcd4