Merge "Rename EXTRA_E_CALL to EXTRA_EMERGENCY_CALL." am: 440158df4f
am: ca239d77d6

Change-Id: I6edd5403d90b0a3f7779026480835175693a2228