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

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

Change-Id: Ic424f8afccb08f94af963e144d5943639384ec3a