Merge "Merge "Camera: VTS: Allow unsupported logical/physical combination" into qt-dev am: d4686a1a06 am: c39db71d53" into qt-r1-dev-plus-aosp
am: dadad4f7b7

Change-Id: I16f619560b3fb5a9bca37d1622a7238a21ea8f03