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

Change-Id: I5cb644bcce1c667b2c627cdc34f3681bc4548bd3