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 am: f5f55ab2 am: 169e3bb6

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



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