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