Merge "Merge "Revert "Make PipTaskOrganizer protected."" into rvc-dev am: d0125c37 am: 177977cc" into rvc-d1-dev-plus-aosp am: 505204e6

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

Change-Id: I49319777ecc60b730c0c6cc731ca6168418227cf