Merge "User cannot reject a waiting call after a switch call fails"
am: ffd2e964c1

Change-Id: Iaec974703843dd8eba86b0f0ba37c6999eb5e9af