Finish springboard at appropriate times

Springboard used to auto finish because of NO_HISTORY, missed
a case where we needed to finish after starting the editor when
given a raw contact URI. Added the finish() call to the method that
starts the editor since the two are logically grouped.

Test: Used the test app to make sure all edit tests have the
springboard finish properly.

Bug: 33040749
Change-Id: I10b7fe5a73d9d965bdb04f0aceffef23f481c48b
diff --git a/src/com/android/contacts/activities/ContactEditorSpringBoardActivity.java b/src/com/android/contacts/activities/ContactEditorSpringBoardActivity.java
index 17c3392..8ce6ecb 100644
--- a/src/com/android/contacts/activities/ContactEditorSpringBoardActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorSpringBoardActivity.java
@@ -200,7 +200,6 @@
             intent.setClass(this, ContactEditorActivity.class);
         }
         startEditorAndForwardExtras(intent);
-        finish();
     }
 
     /**
@@ -233,6 +232,7 @@
             intent.putExtras(extras);
         }
         ImplicitIntentsUtil.startActivityInApp(this, intent);
+        finish();
     }
 
     private void toastErrorAndFinish() {