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