Merge "Notify that keyguard is dismissed when user is unlocked" into rvc-dev am: 6c85a4aceb am: 5a5da871ec am: 7576f12f38

Change-Id: I8d0b0f971bffa0a261293e079cbe70106cbad672