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

Change-Id: Id32674a1021f1902444b996b0ee5eb4be5fe30a1