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

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

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



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