[automerger skipped] Merge "Add Emergency Dial into RIL and Remove PhoneNumberUtils Ecclist check" am: 8336204f99 am: 9038699348
am: 65008ba65b  -s ours

Change-Id: Ie40c3f32d17488c3f41815744b169de486ea0be3