Merge "Notify that keyguard is dismissed when user is unlocked" into rvc-dev am: 6c85a4ac am: 8538ad40 Change-Id: I2f28feae8a444c43e29862989a53c823b3e4cb6f