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

Change-Id: I774056992896bf6ef0a7b310d67fc9442e11d5ef