Merge "Merge "Merge "Revise metrics for emergency dialer" into qt-dev am:...

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
am: d5af673c

Change-Id: I57f53e300ba88e62009512eef5d6daf08b935eb9