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: 1cb3bafe am: c59bba90

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



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