Merge "Do not reparent task or set windowing mode when layout task" into tm-dev am: 97236538

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

Change-Id: I283c0deb291648eb4e3001a336d4a1991538018d