Merge "camera2: Fix error messages in CameraDeviceTest"