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

Change-Id: I7a3f469f787ac024d0ebd16c0c1e94e4d943b66f