Merge "Remove check for preventing re-parenting non-split apps" into tm-dev am: b9fc2e8d am: 57e0300a am: 2b7b4c38

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



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