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 am: c327762d am: 8e55b977

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



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