[Tests] NFC: Expand init accessor with nonmutating set coverage

(cherry picked from commit 3414609)

Author: xedin

test/Interpreter/init_accessors.swift

@@ -865,6 +865,7 @@ do {
 
   struct TestNonMutatingSetNoDefault {
     var _count: Int
+    var _other: String = ""
 
     var count: Int {
       @storageRestrictions(initializes: _count)
@@ -917,7 +918,7 @@ do {
 // CHECK-NEXT: test-nonmutating-set-2: TestNonMutatingSetDefault(_count: 0)
 // CHECK-NEXT: init accessor is called: -1
 // CHECK-NEXT: nonmutating set called: 0
-// CHECK-NEXT: test-nonmutating-set-3: TestNonMutatingSetNoDefault(_count: -1)
+// CHECK-NEXT: test-nonmutating-set-3: TestNonMutatingSetNoDefault(_count: -1, _other: "")
 // CHECK-NEXT: init accessor is called: 42
 // CHECK-NEXT: nonmutating set called: 0
 // CHECK-NEXT: test-nonmutating-set-4: TestNonMutatingSetCustom(_count: 42)

test/SILOptimizer/init_accessor_raw_sil_lowering.swift

@@ -423,8 +423,6 @@ func test_handling_of_nonmutating_set() {
       self.count = 0
     }
   }
-<<<<<<< Updated upstream
-=======
 
   struct TestWithStored {
     private var _count: Int
@@ -468,5 +466,4 @@ func test_handling_of_nonmutating_set() {
       self.count = value
     }
   }
->>>>>>> Stashed changes
 }