Merge "Camera: fix various VTS issues am: a0dd95d45d am: d42258ea80  -s ours" into oc-dr1-dev-plus-aosp