Merge "Merge "Do not trim tasks when updating activity visibilities" into...
Merge "Merge "Do not trim tasks when updating activity visibilities" into rvc-dev am: 9d0f11b3 am: babfb025" into rvc-d1-dev-plus-aosp am: 12ec76e2
Change-Id: I7eb5e9d10268249694db62916bf30fcb7157377c