Merge "Fix black screen after moving top activity to another display" into sc-dev am: 4c080631

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

Change-Id: I1d86e6060214563a53a4936bd5fe0a38749b8c20