Merge "User cannot reject a waiting call after a switch call fails" am: 3af6219876 am: e3d715a49e am: 8142281249

Change-Id: I260d327efa42c1f584898691655d270a6fa2044b