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

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

Change-Id: I886dc501fc498dc9fae5f16fb6e8c55ae41d9fbb