Merge "Fix black screen after moving top activity to another display" into sc-v2-dev am: 8e851faf

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

Change-Id: I40f6c0110f37f01cb1e9a1f08610beb1271f8f48