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

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

Change-Id: Ibe0803db78b3a8318be0c479aec39defb14461dd