Merge "Enable timer in emergency call."
am: 226b01b4fb

Change-Id: I45041d6564d53277b22209ccd7c0a2b337752fd1