Merge changes from topic "emergency-dialer-metrics" am: fa47390a8f
am: 6f4617b6d2

Change-Id: Iaa23ef011afb4c6e90ee42088ea9b4086aef0548