[automerger skipped] Merge "Introduce APIs for Emergency Number Database version" am: 18fa446f44 am: 0a1aca082c
am: 48dc60e388 -s ours
am skip reason: change_id Ie2b0c390948c82ccbb94187a6ded9affd162f5ab with SHA1 1b28fdd6dd is in history

Change-Id: I507e4966441bcad32a2031b0a64d87315725fd9c