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

Change-Id: I51ff49a0a9a19081704086809778851eeaadc2bb