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 am: 4e76e040

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



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