Merge "Camera2 tests: Fix incorrect error code check" into mnc-dev