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

Change-Id: Ide0c7ddc85352d67db061141c0faea59328e4e45