Merge "Add "+" in EmergencyNumber API" into qt-dev
am: 6f9ebc2401

Change-Id: I826c1b278a449279ca10e779f90ce94d60c9c94b