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

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



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