[automerger skipped] Merge "Fix black screen after moving top activity to...

[automerger skipped] Merge "Fix black screen after moving top activity to another display" into sc-dev am: 4c080631 am: 8300e3b0 -s ours am: 758c2079 -s ours

am skip reason: Merged-In Id0971ad8a1c692fdb5376e2c077faa6f00dd61ac with SHA-1 d6fad98b is already in history

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

Change-Id: Ib241096ef927e6fea7c84ce59d4bb9bec93bd951