Merge \"Add metrics for button taps in Settings support tab.\" into nyc-mr1-dev
am: 03e387e5b5

Change-Id: Id8e0c05c7662cbad7cf51cb5708dddc9bc130ecf