Merge "Keystore 2.0 SPI Small doc comment fixup." am: 37356f41 am: 1d4d6f4c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e13b3a668afb12703b02e9418627dedac3c361a