Merge "Add log when we are trying to dismiss keyguard" into oc-dr1-dev
am: f89512c731

Change-Id: If62e97a3a85d1cc0748fb40f91b233104f000e85