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

Change-Id: I509bf2ddd7bcd2ee69b8c8bbfeca4423824cc747