Merge "Restore single-display check for visible recent task" into rvc-dev am:...

Merge "Restore single-display check for visible recent task" into rvc-dev am: a0d33955 am: d31dac02 am: f74da602 am: 0d7d2bd8

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

Change-Id: Ifd1218ddc13340d0868416bd23b2b89724fe8365