[automerger skipped] Merge "Add Emergency Number metrics for Q" am: 3fca0f85
am: 521dfd0c -s ours
am skip reason: change_id I08bf4d2172691c221f89e3139d1e99929d8c83b7 with SHA1 5ad7d07a is in history
Change-Id: Ic0a30bedff67ca17c806daa9763965183e236051