Merge "Preserve the leash reference in PipTaskOrganizer" into udc-dev am:...

Merge "Preserve the leash reference in PipTaskOrganizer" into udc-dev am: 36f3373f am: 31fa82a6 am: d2db7f2c am: 05357d1a

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



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