Merge "Fix black screen after moving top activity to another display" into...

Merge "Fix black screen after moving top activity to another display" into sc-v2-dev am: 8e851faf am: 569d5710

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

Change-Id: Ie3e6afb86af55f9d594ab6ddade8bd259cda3cd9