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

Merge "Merge "Revert "Revert "Remove check for preventing re-parenting non-spl..."" into tm-dev am: 0567c355 am: 4e76e040" into tm-d1-dev-plus-aosp am: fa10832b

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



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