Merge "Do not count AOD showing changes as keyguard's" into rvc-dev am: 9e8c7bd645

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

Change-Id: Ib81d445b73764202b73f6dab28969fcb058ac2ef