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

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

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

Change-Id: If231208769fe0115f2c00a181ac3ed08486f6d4b