Merge "Add metrics for nav buttons through KeyButtonView" into oc-dev
am: 809b79da2f

Change-Id: I1e66207bb9c5fc882f3a8b41e44a6f85d894401b