Merge "Make sure to notify client after Keyguard has been dismissed" into oc-dev am: 56b747fbac
am: 597ee67d61

Change-Id: I5e90c529a6d8f1dc353eb53be4b15e0a07bbd7f3