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: afe4e0d7 am: 36895f68" into rvc-qpr-dev-plus-aosp am: 47b5e952

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

Change-Id: Ifb4621fed36b819e30246138556fb31931a51881