Merge "Fix pip expand issue if parent task under split root" into tm-qpr-dev am: b89627e9

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



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