Merge "camera3: remove redundant hardware error condition"