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: a30b1b8b am: c7984698 am: 6c97ed1c

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

Change-Id: I4750694e50e45a54f18298e837651f15e8ca9645