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

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



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