Merge "Revert "Revert "Remove check for preventing re-parenting non-spl...""...

Merge "Revert "Revert "Remove check for preventing re-parenting non-spl..."" into tm-dev am: 0567c355

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



Change-Id: I3a3e3d559f699dc74cec0bf3ea670b5f13da9dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>