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

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

Change-Id: Ic06656b05ef6e0890524d3b7d63b56897201cb94