Merge "Revert "Remove check for preventing re-parenting non-split apps"" into tm-dev am: 791c612714

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

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