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

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

Change-Id: I32832c66e7b527f56165b35d13282454836a01dc