Merge "AM: Clear keyguardGoingAway after it has gone away"