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