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

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

Change-Id: I4a3f180e6bc174304045a026b9917d0aa538c48b