Merge "Add "+" in EmergencyNumber API"
am: 0e576fe639

Change-Id: I9f6f6aa786c8207939dd5b03b19a3d27826a7798