Merge "Fix flicker when device is unlocked from AOD." into sc-dev am: aaba1884bb am: b60eafbd4a am: 372808902b am: 0a9c44d585

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

Change-Id: I8583a5a2460c2a70736fa53e1ea902995770b5b4