Merge "Do not finish the activity if the activity result is required" into main

tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java

@@ -304,6 +304,16 @@ public class ChooseLockGenericTest {
         assertThat(mActivity.isFinishing()).isTrue();
     }
 
+    @Test
+    public void onActivityResult_requestcode102_resultCancel_shouldFinish() {
+        initActivity(null);
+
+        mFragment.onActivityResult(ChooseLockGenericFragment.CHOOSE_LOCK_REQUEST,
+                Activity.RESULT_CANCELED, null /* data */);
+
+        assertThat(mActivity.isFinishing()).isTrue();
+    }
+
     @Test
     public void onActivityResult_requestcode103_shouldFinish() {
         initActivity(null);