Merge "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: b5678c5a am: 539aa3a3" into sc-v2-dev-plus-aosp am: 8fb9ca95

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

Change-Id: I2725e842588a982ce3a3e88c6dc9845e3d2f5ae1