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

Change-Id: I123b8b3f5be22b72401cc609d9bb2da8875b9897