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

Change-Id: I49d7a5a45598eaa1c8771350c5d0a0ec2a88686b