Merge "Attempt to fix NPE when reparent to the original task." into sc-dev am: fe4efedb7c am: f6930d4faf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14516704 Change-Id: I422e77fe04e0466985073c2acfe82b3a57f214dc
This commit is contained in: