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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7c7aaf39a3afe6c7c81317e03f713524c064d599