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

Change-Id: I9ab62dbe811757f8638e31296c61f09da0fd82a6