[automerger skipped] Merge "Add test function for emergency number db update" am: f2c2731013 am: 8c4d9607fb
am: 55857ac5de -s ours
am skip reason: change_id Ifaec0af0e5100900453a2d794c85cd91925189a1 with SHA1 3b6ee776ff is in history

Change-Id: I55d18e3c0630fab185645eb5bc677c215ac38d3f