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

Change-Id: I22e29abfa964c0448b39987e92b0173c49d59a49