Merge "Merge "Restore single-display check for visible recent task" into...

Merge "Merge "Restore single-display check for visible recent task" into rvc-dev am: a0d33955 am: d31dac02" into rvc-d1-dev-plus-aosp am: 592f7b48 am: 803dfbef

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

Change-Id: I71dd5293eb52d76c053c56892879603f71ffc678