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

Change-Id: Ie4743034e84cb61d95d32fd849856215fca0a975