[automerger skipped] Merge "Introduce Emergency number functions APIs" am: 24cddced04 am: 1bc7e852ef
am: 2764aaee13 -s ours
Change-Id: I59bdc2655ebc1f87defb4693d092acabfb65a7c1
This commit is contained in: