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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic35ee1e49978c705ca765e4c8fbe7117c398abc0