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

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

Change-Id: I1eab0c9491547010eed8c4e20298551eb0c46933