Merge "Integrate IKeystoreAuthorization aidl's addAuthToken with Keystore SPI." am: 9740651028

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I849473e45708f790328dc01e2ae098741673382e