Merge "Fix PipTaskOrganizerTest" into tm-dev am: fe8cf737 am: 775b8e22 am: 74a2671c am: 52dc0ae5

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



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