Merge "Camera: Update service test for multiple vendor providers" into oc-dev