Merge "Re-route to default display if the home activity doesn't support...

Merge "Re-route to default display if the home activity doesn't support multi-display" into sc-dev am: 5600015e

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

Change-Id: Ia6c79c0e0fc99a9a5852dbb2dc7bbdbe9ae86172