[automerger skipped] Merge "Fix black screen after moving top activity to another display" into sc-dev am: 4c0806317a am: eb86fea48e -s ours
am skip reason: Merged-In Id0971ad8a1c692fdb5376e2c077faa6f00dd61ac with SHA-1 5063db3b73 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15226381
Change-Id: Ic04ca71c1d192be5f3158e1d8c8db4ee616e37ec
This commit is contained in: