Merge "Fix flicker when device is unlocked from AOD." into sc-dev am: aaba1884bb am: 47428d13eb am: bfd83062f9 am: 06a7973936

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

Change-Id: I63d4a82416f9be70fc789cd2668c9bd4b6ffcab8