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

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

Change-Id: I3c44a5eb12d09c92ecc03680225fb75f161f5913