Merge "Only reparent controlling tasks when entering split" into sc-dev am: c0302f50 am: 430d02e4

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

Change-Id: I695138f35fe23f17840ccaf4f0a625ec036858f1