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

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

Change-Id: Id8d3da1c97c9f9a34764c1db32d287d82fb37b46