Merge "Integrate IKeystoreAuthorization aidl's addAuthToken with gatekeeperd."