Merge "Add IKeystoreAuthorization AIDL interface with addAuthToken method."