Merge "Clear mAddingToTaskFragment when ActivityStarter is reset" into tm-qpr-dev am: f28ee2053d am: 5624170e27

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19773978

Change-Id: Iacf5f89b483f70602d7a4373aa5b8c0d8d7b01d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/wm/ActivityStarter.java

@@ -2459,6 +2459,7 @@ class ActivityStarter {
 
         mInTask = null;
         mInTaskFragment = null;
+        mAddingToTaskFragment = null;
         mAddingToTask = false;
 
         mSourceRootTask = null;