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

Change-Id: I73172c9f46aefe6382806ce30552a9498ebb7868