[automerger skipped] Merge "Fix test IMS emergency calls using...
[automerger skipped] Merge "Fix test IMS emergency calls using ril.test.emergencynumber" am: fe2b8076 am: f2453b0f -s ours
am skip reason: Change-Id Icba8945acbf9ed55760788354a3cc694bd9e866b with SHA-1 e14b03ee is in history
Change-Id: I8201b3c19cedb90164829e42adce734573f2f50d