Merge "Add new telecom metrics for emergency dialer" am: 0dcc53fd52 am: 28d138a6aa
am: 7d14032afe

Change-Id: I789f6659f25078fcfce673799cb88d1a05c0aa9f