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

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

Change-Id: I274bad211f53124ee119fdc1f6595b59bca38c36