Merge "Ensure we reset reparenting when launching new splits" into udc-qpr-dev am: 60d91d2d

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



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