Merge "Adde back check to make sure Activity.recreate() is called on main thread." into pi-dev

am: 5f8e42f7f0

Change-Id: I9c110947941b4ccb9404b350eb507ec30e701ffc

core/java/android/app/Activity.java

@@ -5580,6 +5580,9 @@ public class Activity extends ContextThemeWrapper
         if (mParent != null) {
             throw new IllegalStateException("Can only be called on top-level activity");
         }
+        if (Looper.myLooper() != mMainThread.getLooper()) {
+            throw new IllegalStateException("Must be called from main thread");
+        }
         mMainThread.scheduleRelaunchActivity(mToken);
     }