Merge "Merge "Notify that keyguard is dismissed when user is unlocked" into rvc-dev am: 6c85a4ac am: 5a5da871 am: 7576f12f" into rvc-qpr-dev-plus-aosp