[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: 2db2ea7e -s ours
am skip reason: Change-Id Icba8945acbf9ed55760788354a3cc694bd9e866b with SHA-1 e14b03ee is in history
Change-Id: Ic5506da55acb95b1280c003b818c5602dd8746b4