[automerger skipped] Merge "Add test function for emergency number db update"...
[automerger skipped] Merge "Add test function for emergency number db update" am: d3d8cd2f am: 8c679a76
am: 5c9d8f47 -s ours
am skip reason: change_id I3a2f5a668d84804c80f94e2227c8e0d6c51e5153 with SHA1 ee2afb34 is in history
Change-Id: I430760480f8ef3360094fb9979a605d188a706ce