Merge "Relaunching activity to PAUSE state" into udc-qpr-dev

core/java/android/app/servertransaction/TransactionExecutorHelper.java

@@ -193,8 +193,8 @@ public class TransactionExecutorHelper {
         switch (prevState) {
             // TODO(lifecycler): Extend to support all possible states.
             case ON_START:
-                lifecycleItem = StartActivityItem.obtain(null /* activityOptions */);
+                // Fall through to return the PAUSE item to ensure the activity is properly
-                break;
+                // resumed while relaunching.
             case ON_PAUSE:
                 lifecycleItem = PauseActivityItem.obtain();
                 break;