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

Merge "Remove check for preventing re-parenting non-split apps" into tm-dev am: b9fc2e8d am: e0908a1b

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



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