Merge "Use correct failure message for call resume failure." am: 6ff5d5a431 am: 47c65f6016
am: c6cd36adee

Change-Id: Idfdf2a23863338a84203b88d9671fc97174c5a0e