Merge "credstore: Pass additional information to Identity Credential HAL."