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: d31dac02 am: f74da602

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

Change-Id: Id51b302fb6d3a108d50f3ad881704c5c57280747