Merge "Merge "Add log when we are trying to dismiss keyguard" into oc-dr1-dev am: f89512c7 am: 3e45cde6 -s ours"