Merge "Merge "Revise metrics for emergency dialer" into qt-dev am: 49444bac" into qt-dev-plus-aosp am: 783f4be8 Change-Id: I8a5161751ed3c0272a2d591ba57b52ae5b0b6f74