Merge "Camera: Try to test additional types of camera providers" into oc-dr1-dev