Merge "Add test function for emergency number db update" am: f2c2731013
am: 8c4d9607fb

Change-Id: I0167c4bc49db8e35697c6b4365eb315bded60663