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