Merge "Keystore 2.0 SPI Small doc comment fixup." am: 37356f4149 am: 1d4d6f4caa am: 2461dcf65f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id91035ac8a2eb0e89f8aaa67027185a279ac3533