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

Change-Id: Ie2e77308094805bdf0ca3512c2ab91e9361972fa