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