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

* commit 'ac4c87f5807b2c36caaf32afaf4765fc97bc6922':
  Make Metrics.logKeyboardAction() method take @KeyboardAction type instead of KeyEvent

Change-Id: I9bcbae73b4bc30f45f546a59586cd8a7fd4c1ee5