Merge "Camera2: Add secondary surface to OutputConfiguration"