Merge "Make Metrics.logKeyboardAction() method take @KeyboardAction type instead of KeyEvent" into nyc-dev