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

Change-Id: If4cba10c23303500b17ceea649a80e12d33bddb7