Merge "Attempt to fix NPE when reparent to the original task." into sc-dev am: fe4efedb am: f6930d4f am: d68b55c6

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

Change-Id: Ib4e1e4917164933c39788401c280ad7211e6b9ed