Merge "Integrate IKeystoreAuthorization aidl's addAuthToken with Keystore SPI." am: 1ef847338e am: 4ed74ba3f1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b4e6305b03f8cc1269404faf45dce118fc61109