Merge "Camera2: Update logical multi-camera requirement"