Merge "Merge "Remove check for preventing re-parenting non-split apps" into...

Merge "Merge "Remove check for preventing re-parenting non-split apps" into tm-dev am: b9fc2e8d am: e0908a1b" into tm-d1-dev-plus-aosp am: fb8035f8

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



Change-Id: Ifde2e910b8e1e48b9d1413cd9772bf02c5673654
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>