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

Change-Id: Id67206c8fc2d291dbac3d003bf9784047677f27c