Merge "Merge "Camera: fix various VTS issues" into oc-dr1-dev am: 5311547c05 am: fb5c49990f  -s ours" into oc-mr1-dev-plus-aosp