[automerger skipped] Merge "Add "+" in EmergencyNumber API" am: 0e576fe639 am: 2a0f679a78 -s ours
am: 415ecb1492 -s ours
am skip reason: change_id I09b0127ce929ec51fbb5c387c383e76dcde5f0b5 with SHA1 82cfdba17a is in history

Change-Id: Id4b9eeeb6c382d9927d4ba26cef327a4396b9165