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

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



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