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

Change-Id: I2aed0df46a1c1c13f6c1f5acb1a415c261643953