Merge "Fix flicker when device is unlocked from AOD." into sc-dev am: aaba1884bb am: b60eafbd4a am: ade103a05b am: faa2f120d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15736949 Change-Id: Ib5368ddbe66902929ed66e47e9da1e6213349043
This commit is contained in: