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

Merge "Revert "Remove check for preventing re-parenting non-split apps"" into tm-dev am: 791c6127 am: 822d98e0 am: 5b590e11 am: 2148d090

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



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