[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 -s ours am: e72c1cb8 -s ours am: c4d8cc17 -s ours

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

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

Change-Id: Ib2399fa4b4803e006339064f0a1d5e2bae2ced63