Merge "clearkey hidl: expand mock error handling"