Merge "camera2: Update spec for mandatory concurrent stream combinations."