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: 87f7c3e8

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



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