Merge "Revert "Integrate IKeystoreAuthorization aidl's addAuthToken wit...""