Merge "Emergency number database config updater" am: ca0f14ec1a am: 9208fc5a0a
am: a1c6087157

Change-Id: Ie1025f6f8173835d00988e54811f031121f4eab6