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