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

Change-Id: I6b18dd46f6c992b3a6a9a3043fa5be6bbc1d9e01