Merge "Notify that keyguard is dismissed when user is unlocked" into rvc-dev am: 6c85a4ac am: 5a5da871 Change-Id: Icf0153746c2270f876f6cd4da53421ed3cd50c66