Merge \\"Add metrics for toll-free/travel-abroad buttons in Settings\\" into nyc-mr1-dev am: 48c5660c1f
am: 45ee8403d0

Change-Id: I9dc5f4bb835f82bffc9adce60ee24eacf0bf7995