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: If7bde0797485df3428b44bc7a525e63a409e7580