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