Merge "Don't hide AOD icons if we're not in KEYGUARD but will be shortly due to the screen off animation." into sc-dev am: b5678c5ac0 am: 539aa3a3c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15098663 Change-Id: I10f15b22bca22d21eb06c60286a2ce6936e10fde
This commit is contained in: