Merge "Enforce CONTROL_KEYGUARD permission on WM.dismissKeyguard API"