Merge "Synchronize screen turning on and unfold overlay" into sc-v2-dev am: 6ba77858

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

Change-Id: I707d47888d0ed436f247287474273b42f5463c5e