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

Merge "Merge "Do not count AOD showing changes as keyguard's" into rvc-dev am: 9e8c7bd6 am: 902da749" into rvc-d1-dev-plus-aosp am: ceb9e76b

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

Change-Id: I5d71d9f577b62215693ccffe930040fa5e26cf0c