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

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

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