Merge "Merge "Notify that keyguard is dismissed when user is unlocked" into...

Merge "Merge "Notify that keyguard is dismissed when user is unlocked" into rvc-dev am: 6c85a4ac am: 5a5da871 am: 7576f12f" into rvc-qpr-dev-plus-aosp am: 90aa4df9

Change-Id: I928eba625df82d74918922971608b906c8a835b1