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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5bfa045c05804e86f471194b57a272eae47ec7cb