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

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

Change-Id: I09db24a9ed902d67695e52543f9218e216b80153