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

Change-Id: Id829ee7236120b0d0ada8bd698c9d68c6333485b