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

Change-Id: Ia35d403cc7cfeaa75c627242ec05dac8d4620b55